merge trunk
authorK. Handa <handa@gnu.org>
Sun, 10 Mar 2013 14:30:19 +0000 (23:30 +0900)
committerK. Handa <handa@gnu.org>
Sun, 10 Mar 2013 14:30:19 +0000 (23:30 +0900)
commit1c67811cecae3d3142e0400be6d314dfa6f55eef
treeac1ecd2461d2b940e602167806059558082abdc2
parent8a5983424496d9b36f596a44ac1e643d80f87fa0
parent25573f61f9eaf1631c03d16486ffc17fd9b18503
merge trunk